projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bbd927 8a1d582)
bitkeeper revision 1.1159.66.1 (41359af6EMOcIvoJMIw5c8P22_l2Pw)
authorxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Wed, 1 Sep 2004 09:48:38 +0000 (09:48 +0000)
committerxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Wed, 1 Sep 2004 09:48:38 +0000 (09:48 +0000)
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk

1  2 
tools/python/xen/xend/server/netif.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xend/server/netif.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.